Micron Document
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
| SparkN0de-git | SparkN0de |
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Node / ReticulumProjects / NomadNet.git / commits / c6cf11d


Commit c6cf11df36ced22d6bdb11dd0ffa741dd8176e13

󰉖 Browse tree at this commit

Parents : 553ba92
Author : Mark Qvist <mark@unsigned.io>
Date : 2021-05-13T16:39:50+02:00

Cleanup

Changes

1 files changed, 9 insertions(+), 16 deletions(-)

M nomadnet/NomadNetworkApp.py +9 -16

Diff

diff --git a/nomadnet/NomadNetworkApp.py b/nomadnet/NomadNetworkApp.py
index e38ce26..7d08ecd 100644
--- a/nomadnet/NomadNetworkApp.py
+++ b/nomadnet/NomadNetworkApp.py
@@ -16,7 +16,10 @@ class NomadNetworkApp:
configdir = os.path.expanduser("~")+"/.nomadnetwork"
def exit_handler(self):
- RNS.log("Nomad Network Client exit handler executing...")
+ RNS.log("Nomad Network Client exit handler executing...", RNS.LOG_VERBOSE)
+ RNS.log("Saving directory...", RNS.LOG_VERBOSE)
+ self.directory.save_to_disk()
+ RNS.log("Nomad Network Client exiting now", RNS.LOG_VERBOSE)
def __init__(self, configdir = None, rnsconfigdir = None):
self.version = __version__
@@ -34,6 +37,8 @@ class NomadNetworkApp:
if NomadNetworkApp._shared_instance == None:
NomadNetworkApp._shared_instance = self
+ self.rns = RNS.Reticulum(configdir = rnsconfigdir)
+
self.configpath = self.configdir+"/config"
self.logfilepath = self.configdir+"/logfile"
self.storagepath = self.configdir+"/storage"
@@ -41,6 +46,7 @@ class NomadNetworkApp:
self.cachepath = self.configdir+"/storage/cache"
self.resourcepath = self.configdir+"/storage/resources"
self.conversationpath = self.configdir+"/storage/conversations"
+ self.directorypath = self.configdir+"/storage/directory"
if not os.path.isdir(self.storagepath):
os.makedirs(self.storagepath)
@@ -97,7 +103,6 @@ class NomadNetworkApp:
nomadnet.panic()
- self.rns = RNS.Reticulum(configdir = rnsconfigdir)
atexit.register(self.exit_handler)
self.message_router = LXMF.LXMRouter()
@@ -106,6 +111,8 @@ class NomadNetworkApp:
self.lxmf_destination = self.message_router.register_delivery_identity(self.identity)
RNS.log("LXMF Router ready to receive on: "+RNS.prettyhexrep(self.lxmf_destination.hash))
+ self.directory = nomadnet.Directory.Directory(self)
+
nomadnet.ui.spawn(self.uimode)
@@ -122,20 +129,6 @@ class NomadNetworkApp:
nomadnet.Conversation.ingest(message, self)
- # RNS.log("\t+--- LXMF Delivery ---------------------------------------------")
- # RNS.log("\t| Message ID : "+RNS.prettyhexrep(message.hash))
- # RNS.log("\t| Source hash : "+RNS.prettyhexrep(message.source_hash))
- # RNS.log("\t| Source instance : "+str(message.get_source()))
- # RNS.log("\t| Destination hash : "+RNS.prettyhexrep(message.destination_hash))
- # RNS.log("\t| Destination instance : "+str(message.get_destination()))
- # RNS.log("\t| Transport Encryption : "+str(message.transport_encryption))
- # RNS.log("\t| Timestamp : "+time_string)
- # RNS.log("\t| Title : "+message.title_as_string())
- # RNS.log("\t| Content : "+message.content_as_string())
- # RNS.log("\t| Fields : "+str(message.fields))
- # RNS.log("\t| Message signature : "+signature_string)
- # RNS.log("\t+---------------------------------------------------------------")
-
def conversations(self):
return nomadnet.Conversation.conversation_list(self)


──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────